extensions-tool: Adjust enable/disable commands to shell changes

Change both 'enabled-extensions' and 'disabled-extensions' keys as in
commit ce1bee727. While those actions are now also exposed by the
shell's D-Bus API, there is some value in allowing the tool to be used
outside a running GNOME session (for example in setup scripts), so
keep changing the GSettings keys directly.

https://gitlab.gnome.org/GNOME/gnome-shell/issues/1234

diff --git a/src/extensions-tool/command-disable.c b/src/extensions-tool/command-disable.c
index 9c50e1a3ddc8c635a81274c2ca0486a5d8cb6d3f..aa8efab5bc35e370ce7b300653f6d0c589b29408 100644 (file)
--- a/src/extensions-tool/command-disable.c
+++ b/src/extensions-tool/command-disable.c
@@ -33,7 +33,8 @@ disable_extension (const char *uuid)
   if (settings == NULL)
     return FALSE;
 
-  return settings_list_remove (settings, "enabled-extensions", uuid);
+  return settings_list_remove (settings, "enabled-extensions", uuid) &&
+         settings_list_add (settings, "disabled-extensions", uuid);
 }
 
 int

diff --git a/src/extensions-tool/command-enable.c b/src/extensions-tool/command-enable.c
index 2358f8ba2a6c973cb402cd1aec128a0a747a58ab..c790ec95f357c2d9189959e22bebebe70a1c0bc8 100644 (file)
--- a/src/extensions-tool/command-enable.c
+++ b/src/extensions-tool/command-enable.c
@@ -33,7 +33,8 @@ enable_extension (const char *uuid)
   if (settings == NULL)
     return FALSE;
 
-  return settings_list_add (settings, "enabled-extensions", uuid);
+  return settings_list_add (settings, "enabled-extensions", uuid) &&
+         settings_list_remove (settings, "disabled-extensions", uuid);
 }
 
 int